Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Feb 2011 00:21:32 +0000 (16:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Feb 2011 00:21:32 +0000 (16:21 -0800)
commit06fd5bd69e092d2522a7e5afaff19fa6e2095758
tree8b20aa647bd304766736de4775d49ef431c10a78
parent0a04267bdc1fca986bf0ddd5d65146becf4d1489
parent3a5499f9a6aa8ebe1dc1312c4d6f3be810fa1711
Merge from mainline.
ChangeLog